Produced by Araxis Merge on 2021-05-13 09:08:59 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | /Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/Model/Config/Settings/Category | Type.php | 2019-09-06 14:26:28 +0000 |
| 2 | /Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/Model/Config/Settings/Category | Type.php | 2021-03-20 01:29:28 +0000 |
| Description | Between Files 1 and 2 | |
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 4 | 34 |
| Changed | 3 | 38 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | Consecutive whitespace is treated as a single space |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
| Active line-pairing rules |
No regular expressions were active.
| 1 | <?php | 1 | <?php | |||
| 2 | namespace Smartwave\Porto\Model\Config\Settings\Category; | 2 | namespace Smartwave\Porto\Model\Config\Settings\Category; | |||
| 3 | 3 | |||||
| 4 | class Type implements \Magento\Framework\Option\ArrayInterface | 4 | class Type implements \Magento\Framework\Option\ArrayInterface | |||
| 5 | { | 5 | { | |||
| 6 | public function toOptionArray() | 6 | public function toOptionArray() | |||
| 7 | { | 7 | { | |||
| 8 | return [ | 8 | return [ | |||
| 9 | » ['value' => '1', 'label' => __('Type 1')], | 9 | » ['value' => '1', 'label' => __('Type 1')], | |||
| 10 | » ['value' => '2', 'label' => __('Type 2')], | 10 | » ['value' => '2', 'label' => __('Type 2')], | |||
| 11 | » ['value' => '3', 'label' => __('Type 3')], | 11 | » ['value' => '3', 'label' => __('Type 3')], | |||
| 12 | » ['value' => '4', 'label' => __('Type 4')], | 12 | » ['value' => '4', 'label' => __('Type 4')], | |||
| 13 | » ['value' => '5', 'label' => __('Type 5')], | 13 | » ['value' => '5', 'label' => __('Type 5')], | |||
| 14 | » ['value' => '6', 'label' => __('Type 6')], | 14 | » ['value' => '6', 'label' => __('Type 6')], | |||
| 15 | » ['value' => '7', 'label' => __('Type 7')], | 15 | » ['value' => '7', 'label' => __('Type 7')], | |||
| 16 | » ['value' => '8', 'label' => __('Type 8')], | 16 | » ['value' => '8', 'label' => __('Type 8')], | |||
| 17 | » ['value' => '9', 'label' => __('Type 9')] | 17 | » ['value' => '9', 'label' => __('Type 9')], | |||
| 18 | » ['value' => '10', 'label' => __('Type 10')] | |||||
| 18 | ]; | 19 | ]; | |||
| 19 | } | 20 | } | |||
| 20 | 21 | |||||
| 21 | public function toArray() | 22 | public function toArray() | |||
| 22 | { | 23 | { | |||
| 23 | return [ | 24 | return [ | |||
| 24 | » '1' => __('Type 1'), | 25 | » '1' => __('Type 1'), | |||
| 25 | » '2' => __('Type 2'), | 26 | » '2' => __('Type 2'), | |||
| 26 | » '3' => __('Type 3'), | 27 | » '3' => __('Type 3'), | |||
| 27 | » '4' => __('Type 4'), | 28 | » '4' => __('Type 4'), | |||
| 28 | » '5' => __('Type 5'), | 29 | » '5' => __('Type 5'), | |||
| 29 | » '6' => __('Type 6'), | 30 | » '6' => __('Type 6'), | |||
| 30 | » '7' => __('Type 7'), | 31 | » '7' => __('Type 7'), | |||
| 31 | » '8' => __('Type 8'), | 32 | » '8' => __('Type 8'), | |||
| 32 | » '9' => __('Type 9') | 33 | » '9' => __('Type 9'), | |||
| 34 | » '9' => __('Type 10') | |||||
| 33 | ]; | 35 | ]; | |||
| 34 | } | 36 | } | |||
| 35 | } | 37 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.